diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php
index 06d8780..f3b30a4 100644
--- a/system/application/config/autoload.php
+++ b/system/application/config/autoload.php
@@ -37,7 +37,7 @@
 |	$autoload['libraries'] = array('database', 'session', 'xmlrpc');
 */
 
-$autoload['libraries'] = array();
+$autoload['libraries'] = array('database');
 
 
 /*
diff --git a/system/application/config/database.php b/system/application/config/database.php
index 7a5764d..b03cb3a 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -34,7 +34,7 @@
 $db['default']['hostname'] = "localhost";
 $db['default']['username'] = "root";
 $db['default']['password'] = "";
-$db['default']['database'] = "ellislab";
+$db['default']['database'] = "test";
 $db['default']['dbdriver'] = "mysql";
 $db['default']['dbprefix'] = "";
 $db['default']['active_r'] = TRUE;
diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index d2342de..a801c08 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -41,7 +41,7 @@
 * @param	bool	optional flag that lets classes get loaded but not instantiated
 * @return	object
 */
-function &_load_class($class, $instantiate = TRUE)
+function _load_class($class, $instantiate = TRUE)
 {
 	static $objects = array();
 
@@ -121,7 +121,6 @@
 /**
 * Loads the main config.php file
 *
-*
 * @access	private
 * @return	array
 */
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 6a3ea99..2a4c195 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -504,7 +504,7 @@
 		$obj =& get_instance();
 		$obj->db =& $DB;
 	}
-
+	
 	// --------------------------------------------------------------------
 
 	/**